4e3b46
@@ -22,14 +22,13 @@
 
 package org.jboss.as.server.deployment;
 
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
 import static org.jboss.as.server.controller.resources.DeploymentAttributes.ENABLED;
+import static org.jboss.as.server.controller.resources.DeploymentAttributes.RUNTIME_NAME;
 
 import org.jboss.as.controller.OperationContext;
 import org.jboss.as.controller.OperationFailedException;
 import org.jboss.as.controller.OperationStepHandler;
 import org.jboss.as.controller.PathAddress;
-import org.jboss.as.controller.PathElement;
 import org.jboss.as.controller.registry.Resource;
 import org.jboss.dmr.ModelNode;
 import org.jboss.msc.service.ServiceController;
@@ -44,10 +43,9 @@
public class DeploymentStatusHandler implements OperationStepHandler {
 
     @Override
     public void execute(OperationContext context, ModelNode operation) throws OperationFailedException {
-        final PathAddress address = PathAddress.pathAddress(operation.get(OP_ADDR));
-        final PathElement element = address.getLastElement();
         final ModelNode deployment = Resource.Tools.readModel(context.readResource(PathAddress.EMPTY_ADDRESS));
         final boolean isEnabled = ENABLED.resolveModelAttribute(context, deployment).asBoolean();
+        final String runtimeName = RUNTIME_NAME.resolveModelAttribute(context, deployment).asString();
         context.addStep(new OperationStepHandler() {
             @Override
             public void execute(final OperationContext context, final ModelNode operation) throws OperationFailedException {
@@ -55,7 +53,7 @@
public class DeploymentStatusHandler implements OperationStepHandler {
                 if (!isEnabled) {
                     result.set(AbstractDeploymentUnitService.DeploymentStatus.STOPPED.toString());
                 } else {
-                    final ServiceController<?> controller = context.getServiceRegistry(false).getService(Services.deploymentUnitName(element.getValue()));
+                    final ServiceController<?> controller = context.getServiceRegistry(false).getService(Services.deploymentUnitName(runtimeName));
                     if (controller != null) {
                         if (controller.getSubstate() == ServiceController.Substate.WONT_START &&
                                 controller.getState() == ServiceController.State.DOWN) {
